Skip to content

use Git/git instead of Mercurial/hg#67

Closed
matrixise wants to merge 6 commits intopython:githubfrom
matrixise:github-second-round
Closed

use Git/git instead of Mercurial/hg#67
matrixise wants to merge 6 commits intopython:githubfrom
matrixise:github-second-round

Conversation

@matrixise
Copy link
Member

@matrixise matrixise commented Oct 21, 2016

Please, could you check this branch ? this branch is not complete because some files ask more work.

@matrixise
Copy link
Member Author

matrixise commented Oct 21, 2016

work on communication.rst, devcycle.rst, documenting.rst, grammar.rst, index.rst and setup.rst

This was referenced Oct 21, 2016
Closed
Closed
@matrixise
Copy link
Member Author

matrixise commented Oct 21, 2016 •
edited
Loading

patch for these issues: #46 and #50

@brettcannon
Copy link
Member

brettcannon commented Oct 21, 2016

Can you do this against the github branch?

@matrixise
Copy link
Member Author

matrixise commented Oct 21, 2016

yep, I will propose to the github branch

@brettcannon
Copy link
Member

brettcannon commented Oct 21, 2016

You can try changing the base branch directly in this PR, but I didn't want to do it for you in case there were conflicts.

@matrixise
Copy link
Member Author

matrixise commented Oct 21, 2016

I think there will be some conflicts, because there is a diff between master and github

brettcannon
brettcannon reviewed Oct 21, 2016
View reviewed changes
setup.rst
CPython is developed using `Git <https://git-scm.com/>`_. The Git command line
program is named ``git``; this is also used to refer to Git itself. Git is
easily available for common Unix systems by way of the standard package manager;
under Windows, you might want to use the `TortoiseGit <http://tortoisegit.org/>`_
Copy link
Member

@brettcannon brettcannon Oct 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be worth also linking to https://desktop.github.com/ as well at TortoiseGit.

Copy link
Member Author

@matrixise matrixise Oct 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, we have some possibilities for a desktop interface for Git.

@matrixise matrixise changed the base branch from master to github October 22, 2016 12:00
@brettcannon
Copy link
Member

brettcannon commented Oct 28, 2016

@matrixise did you want to resolve the conflicts in this PR? Otherwise I can revert the changes in setup.rst so I can merge this PR.

@brettcannon brettcannon mentioned this pull request Oct 28, 2016
Merged
@brettcannon
Copy link
Member

brettcannon commented Oct 28, 2016

I forked this PR so that the work @matrixise did could be used to close out the last GitHub migration milestone bug!

SerhiiNecheporenko referenced this pull request Nov 8, 2020
@pablogsal @tim-one
@terryjreedy @brettcannon
Add section about the design of CPython's garbage collector (#562)
d43d6e9 
Co-Authored-By: Tim Peters <tim.peters@gmail.com>
Co-Authored-By: Terry Jan Reedy <tjreedy@udel.edu>
Co-authored-by: Brett Cannon <brettcannon@users.noreply.github.com>
jablonskidev added a commit to jablonskidev/devguide that referenced this pull request Mar 20, 2021
@jablonskidev
Added copyright link for the devguide
ce0e204 
In order to resolve issues python#652 and python#653 in the devguide (which are duplicates of each other), we added a theme variable to `python_docs_theme/layout.html` in PR python#67. This will allow all users of the python-docs-theme library to have more functionality and backwards compatibility. In addition, if users don't define a link for copyright information, then they won't have a broken link that leads to nowhere in their page footer.

In order to have the correct copyright link for the devguide specifically, we just needed to specify it in the `html_theme_options` dictionary in the devguide's `conf.py`, which I did in this commit.
@jablonskidev jablonskidev mentioned this pull request Mar 20, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brettcannon brettcannon brettcannon left review comments

Assignees

No one assigned

Labels

CLA signed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@matrixise @brettcannon @the-knights-who-say-ni @berkerpeksag